Merge "Allow AbortLogin hook to override error messages"